merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 15 Apr 2011 05:30:52 +0000 (14:30 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 15 Apr 2011 05:30:52 +0000 (14:30 +0900)

Trivial merge